projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0141651
)
cssprovider: @import <string> is valid CSS
author
Benjamin Otte
<otte@redhat.com>
Tue, 19 Jul 2011 23:19:59 +0000
(
01:19
+0200)
committer
Benjamin Otte
<otte@redhat.com>
Wed, 20 Jul 2011 00:36:44 +0000
(
02:36
+0200)
The parser rewrite insisted on @import url(<string>) syntax, but CSS
xplicitly allows omitting the url string.
gtk/gtkcssprovider.c
patch
|
blob
|
history
diff --git
a/gtk/gtkcssprovider.c
b/gtk/gtkcssprovider.c
index 4be5b7516ba43925ffa2a6c9e248e796960f5c8f..6ffb1a6c7b8cbb07fd36f7b7544b7ab671a7cfa1 100644
(file)
--- a/
gtk/gtkcssprovider.c
+++ b/
gtk/gtkcssprovider.c
@@
-1670,7
+1670,10
@@
parse_import (GtkCssScanner *scanner)
GFile *file;
char *uri;
- uri = _gtk_css_parser_read_uri (scanner->parser);
+ if (_gtk_css_parser_is_string (scanner->parser))
+ uri = _gtk_css_parser_read_string (scanner->parser);
+ else
+ uri = _gtk_css_parser_read_uri (scanner->parser);
if (uri == NULL)
{
_gtk_css_parser_resync (scanner->parser, TRUE, 0);